From 3cb9c2e1fc33bf2b637b11ecbf6f7c1184d3fc08 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 15 May 2006 07:46:57 +0100 Subject: [PATCH] Fix the performance issues of 2-level paging HVM guests on the PAE Xen. With this, the performance will be basically same as 2-on-2. Signed-off-by: Jun Nakajima --- xen/arch/x86/shadow.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c index 7d6820e37c..729e5474e9 100644 --- a/xen/arch/x86/shadow.c +++ b/xen/arch/x86/shadow.c @@ -347,6 +347,13 @@ alloc_shadow_page(struct domain *d, d->arch.shadow_page_count++; if ( PGT_l4_page_table == PGT_root_page_table ) pin = 1; +#if CONFIG_PAGING_LEVELS == 3 & defined (GUEST_PGENTRY_32) + /* + * We use PGT_l4_shadow for 2-level paging guests on PAE + */ + if ( d->arch.ops->guest_paging_levels == PAGING_L2 ) + pin = 1; +#endif break; #if CONFIG_PAGING_LEVELS >= 4 @@ -2425,6 +2432,17 @@ static void shadow_update_pagetables(struct vcpu *v) /* * arch.shadow_table */ +#if CONFIG_PAGING_LEVELS == 3 & defined (GUEST_PGENTRY_32) + /* + * We use PGT_l4_shadow for 2-level paging guests on PAE + */ + if ( d->arch.ops->guest_paging_levels == PAGING_L2 ) + { + if ( unlikely(!(smfn = __shadow_status(d, gpfn, PGT_l4_shadow))) ) + smfn = shadow_l3_table(v, gpfn, gmfn); + } + else +#endif if ( unlikely(!(smfn = __shadow_status(d, gpfn, PGT_base_page_table))) ) { #if CONFIG_PAGING_LEVELS == 2 -- 2.30.2